From b7af6be266e3595d7fb925f6156d6732dc456df6 Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Thu, 11 Jan 2018 17:47:57 +0000 Subject: [PATCH] x86/svm: Offer CPUID Faulting to AMD HVM guests as well CPUID Faulting can be virtulised for HVM guests without hardware support, meaning it can be offered to SVM guests. Signed-off-by: Andrew Cooper --- xen/arch/x86/hvm/svm/svm.c | 6 ++++++ xen/arch/x86/msr.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index c48fdfaa5d..9d9ad777d1 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -1786,6 +1786,12 @@ static void svm_vmexit_do_cpuid(struct cpu_user_regs *regs) if ( (inst_len = __get_instruction_length(curr, INSTR_CPUID)) == 0 ) return; + if ( hvm_check_cpuid_faulting(curr) ) + { + hvm_inject_hw_exception(TRAP_gp_fault, 0); + return; + } + guest_cpuid(curr, regs->eax, regs->ecx, &res); HVMTRACE_5D(CPUID, regs->eax, res.a, res.b, res.c, res.d); diff --git a/xen/arch/x86/msr.c b/xen/arch/x86/msr.c index 31983edc54..187f8623a5 100644 --- a/xen/arch/x86/msr.c +++ b/xen/arch/x86/msr.c @@ -39,7 +39,8 @@ static void __init calculate_hvm_max_policy(void) return; /* 0x000000ce MSR_INTEL_PLATFORM_INFO */ - if ( boot_cpu_data.x86_vendor == X86_VENDOR_INTEL ) + if ( boot_cpu_data.x86_vendor == X86_VENDOR_INTEL || + boot_cpu_data.x86_vendor == X86_VENDOR_AMD ) { dp->plaform_info.available = true; dp->plaform_info.cpuid_faulting = true; -- 2.30.2